From: Juri Linkov <juri@jurta.org>
Date: Sun, 19 Jul 2009 16:56:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11393
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f2392a9d989b46b17af8766bb7fb9a718ddfa525;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d5465a3d4f..042217c637e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2009-07-19  Juri Linkov  <juri@jurta.org>
+
+	* files.el (ignored-local-variables): Add `dir-local-variables-alist'.
+	(dir-local-variables-alist): New buffer-local variable.
+	(hack-local-variables-filter): If variable is not dir-local,
+	i.e. `dir-name' is nil, then remove it from `dir-local-variables-alist',
+	because file-local overrides dir-local.
+	(c-postprocess-file-styles)<declare-function>:
+	Remove obsolete declaration.
+	(hack-dir-local-variables): Add dir-local variable/value pair to
+	`dir-local-variables-alist' and remove duplicates.  Doc fix.
+
+	* help-fns.el (describe-variable): Add information about
+	file-local and dir-local variables.
+
 2009-07-19  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (hack-local-variables-filter): Rewrite.